From fb8a3e3249601a4153a47c096bc005f793de3dc3 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Fri, 20 Mar 2015 19:30:47 -0700 Subject: [PATCH] List examples in binaries built This is required for `cargo run` to work --- src/cargo/ops/cargo_rustc/context.rs | 3 +-- src/cargo/ops/cargo_rustc/fingerprint.rs | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/cargo/ops/cargo_rustc/context.rs b/src/cargo/ops/cargo_rustc/context.rs index 360887787..22d9dc01c 100644 --- a/src/cargo/ops/cargo_rustc/context.rs +++ b/src/cargo/ops/cargo_rustc/context.rs @@ -376,8 +376,7 @@ impl<'a, 'b: 'a> Context<'a, 'b> { ret.push((pkg, t, self.lib_profile(pkg.package_id()))); } - // If this is a test profile, then we need to ensure that all binaries - // are built. + // Integration tests/benchmarks require binaries to be built if profile.test && (target.is_test() || target.is_bench()) { ret.extend(pkg.targets().iter().filter(|t| t.is_bin()) .map(|t| (pkg, t, self.lib_profile(pkg.package_id())))); diff --git a/src/cargo/ops/cargo_rustc/fingerprint.rs b/src/cargo/ops/cargo_rustc/fingerprint.rs index 213a81c01..a88ad00ae 100644 --- a/src/cargo/ops/cargo_rustc/fingerprint.rs +++ b/src/cargo/ops/cargo_rustc/fingerprint.rs @@ -64,7 +64,7 @@ pub fn prepare_target<'a, 'b>(cx: &mut Context<'a, 'b>, if profile.test { cx.compilation.tests.push((target.name().to_string(), dst)); - } else if target.is_bin() { + } else if target.is_bin() || target.is_example() { cx.compilation.binaries.push(dst); } else if target.is_lib() { let pkgid = pkg.package_id().clone(); -- 2.30.2